From: MatmaRex <matma.rex@gmail.com>
Date: Wed, 27 Mar 2013 20:16:57 +0000 (+0100)
Subject: (bug 46615) updateCollation.php: sanity check the collation before proceeding
X-Git-Tag: 1.31.0-rc.0~20107^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=6eb84144df605feb717efc91c84c00eaec62a5f6;p=lhc%2Fweb%2Fwiklou.git

(bug 46615) updateCollation.php: sanity check the collation before proceeding

Change-Id: I5be1b1ec1823fdb7438c3f501fb6194142c1e9dc
---

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index a76a1ee69a..8118f682f1 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -82,6 +82,10 @@ TEXT;
 			$collation = Collation::singleton();
 		}
 
+		// Collation sanity check: in some cases the constructor will work,
+		// but this will raise an exception, breaking all category pages
+		$collation->getFirstLetterData();
+
 		$options = array(
 			'LIMIT' => self::BATCH_SIZE,
 			'ORDER BY' => 'cl_to, cl_type, cl_from',